projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fc71cbe)
Don't use stock APIs in the testsuite
authorWilliam Jon McCann <william.jon.mccann@gmail.com>
Mon, 24 Jun 2013 21:57:44 +0000 (17:57 -0400)
committerWilliam Jon McCann <william.jon.mccann@gmail.com>
Mon, 24 Jun 2013 23:53:08 +0000 (19:53 -0400)
testsuite/a11y/children.c patch | blob | history
testsuite/a11y/menu.ui patch | blob | history
testsuite/a11y/menus.ui patch | blob | history
testsuite/a11y/notebook.ui patch | blob | history
testsuite/gtk/filechooser.c patch | blob | history
testsuite/gtk/templates.c patch | blob | history
testsuite/reftests/inherit-and-initial.ref.ui patch | blob | history
testsuite/reftests/inherit-and-initial.ui patch | blob | history
testsuite/reftests/separator-size.ref.ui patch | blob | history
testsuite/reftests/separator-size.ui patch | blob | history

diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c
index f94e4959a7d68470c75fedf850c5c74fa8f505a2..21d280172df1034342593e7b9c059839b166773a 100644 (file)
--- a/testsuite/a11y/children.c
+++ b/testsuite/a11y/children.c
@@ -116,14 +116,14 @@ do_create_child (STATE *state, gint i)
       switch (i)
         {
         case 0:
-          gtk_entry_set_icon_from_stock (GTK_ENTRY (state->widget),
-                                         GTK_ENTRY_ICON_PRIMARY,
-                                         GTK_STOCK_CAPS_LOCK_WARNING);
+          gtk_entry_set_icon_from_icon_name (GTK_ENTRY (state->widget),
+                                             GTK_ENTRY_ICON_PRIMARY,
+                                             "dialog-warning-symbolic");
         return TRUE;
         case 1:
-          gtk_entry_set_icon_from_stock (GTK_ENTRY (state->widget),
-                                         GTK_ENTRY_ICON_SECONDARY,
-                                         GTK_STOCK_CLEAR);
+          gtk_entry_set_icon_from_icon_name (GTK_ENTRY (state->widget),
+                                             GTK_ENTRY_ICON_SECONDARY,
+                                             "edit-clear");
         return TRUE;
         default:
           return FALSE;
diff --git a/testsuite/a11y/menu.ui b/testsuite/a11y/menu.ui
index bb2274f515e23a956e661b8ad7e7d3ac52073731..d4509c20850326ca6b12476335d511ea6d96525a 100644 (file)
--- a/testsuite/a11y/menu.ui
+++ b/testsuite/a11y/menu.ui
@@ -19,23 +19,21 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem1">
-                    <property name="label">gtk-new</property>
+                  <object class="GtkMenuItem" id="imagemenuitem1">
+                    <property name="label" translatable="yes">_New</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem2">
-                    <property name="label">gtk-open</property>
+                  <object class="GtkMenuItem" id="imagemenuitem2">
+                    <property name="label" translatable="yes">_Open</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                     <child type="submenu">
                       <object class="GtkMenu" id="menu4">
                         <property name="visible">True</property>
@@ -78,23 +76,21 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem3">
-                    <property name="label">gtk-save</property>
+                  <object class="GtkMenuItem" id="imagemenuitem3">
+                    <property name="label" translatable="yes">_Save</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkImageMenuItem" id="imagemenuitem4">
-                    <property name="label">gtk-save-as</property>
+                    <property name="label" translatable="yes">Save _As</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
@@ -122,13 +118,12 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem5">
-                    <property name="label">gtk-quit</property>
+                  <object class="GtkMenuItem" id="imagemenuitem5">
+                    <property name="label" translatable="yes">_Quit</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
               </object>
@@ -147,43 +142,39 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem6">
-                    <property name="label">gtk-cut</property>
+                  <object class="GtkMenuItem" id="imagemenuitem6">
+                    <property name="label" translatable="yes">Cu_t</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkImageMenuItem" id="imagemenuitem7">
-                    <property name="label">gtk-copy</property>
+                    <property name="label" translatable="yes">_Copy</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkImageMenuItem" id="imagemenuitem8">
-                    <property name="label">gtk-paste</property>
+                    <property name="label" translatable="yes">_Paste</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkImageMenuItem" id="imagemenuitem9">
-                    <property name="label">gtk-delete</property>
+                    <property name="label" translatable="yes">_Delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
               </object>
@@ -211,13 +202,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem10">
-                    <property name="label">gtk-about</property>
+                  <object class="GtkMenuItem" id="imagemenuitem10">
+                    <property name="label" translatable="yes">_About</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
               </object>
diff --git a/testsuite/a11y/menus.ui b/testsuite/a11y/menus.ui
index 5b926f3917afacbc8b1533ec68c0ee18cc512b61..d641a67c120345df88a47ccdb36d84a592d9c8c2 100644 (file)
--- a/testsuite/a11y/menus.ui
+++ b/testsuite/a11y/menus.ui
@@ -4,7 +4,7 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-go-up</property>
+    <property name="icon-name">go-up</property>
     <property name="icon-size">5</property>
   </object>
   <object class="GtkWindow" id="window1">
@@ -25,23 +25,21 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem1">
-                    <property name="label">gtk-new</property>
+                  <object class="GtkMenuItem" id="imagemenuitem1">
+                    <property name="label" translatable="yes">_New</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
-                    <property name="use_stock">True</property>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkImageMenuItem" id="imagemenuitem2">
+                  <object class="GtkMenuItem" id="imagemenuitem2">
                     <property name="label" translatable="yes">bla</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="image">image1</property>
-                    <property name="use_stock">False</property>
                   </object>
                 </child>
                 <child>
diff --git a/testsuite/a11y/notebook.ui b/testsuite/a11y/notebook.ui
index 95d1328ab090b09b618505017db113507da63c99..46cc7378a29a8e1ecec1e962fdb87bcb2fd1bffb 100644 (file)
--- a/testsuite/a11y/notebook.ui
+++ b/testsuite/a11y/notebook.ui
@@ -9,8 +9,7 @@
         <property name="visible">True</property>
         <child>
           <object class="GtkButton" id="page1">
-            <property name="label">gtk-yes</property>
-            <property name="use_stock">True</property>
+            <property name="label" translatable="yes">Yes</property>
             <property name="visible">True</property>
           </object>
         </child>
@@ -22,8 +21,7 @@
         </child>
         <child>
           <object class="GtkButton" id="page2">
-            <property name="label">gtk-no</property>
-            <property name="use_stock">True</property>
+            <property name="label" translatable="yes">No</property>
             <property name="visible">True</property>
           </object>
         </child>
diff --git a/testsuite/gtk/filechooser.c b/testsuite/gtk/filechooser.c
index 529f87d46b79f8237c6b54a3d150ac81744fe484..831425ffbc84d36c0708aaf426b1cebb8ff25da3 100644 (file)
--- a/testsuite/gtk/filechooser.c
+++ b/testsuite/gtk/filechooser.c
@@ -130,11 +130,11 @@ test_set_filename (GtkFileChooserAction action,
   guint timeout_id;
 
   chooser = gtk_file_chooser_dialog_new ("hello", NULL, action,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
                                         NULL);
 
   closure.chooser = chooser;
-  closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (chooser), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);
+  closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (chooser), _("_OK"), GTK_RESPONSE_ACCEPT);
   closure.focus_button = focus_button;
 
   gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT);
@@ -1796,10 +1796,10 @@ test_confirm_overwrite_for_path (const char *path, gboolean append_extension)
   closure.extension = NULL;
   closure.confirm_overwrite_signal_emitted = 0;
   closure.chooser = gtk_file_chooser_dialog_new ("hello", NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
-                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                                _("_Cancel"), GTK_RESPONSE_CANCEL,
                                                 NULL);
   closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (closure.chooser),
-                                                 GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
+                                                 _("_Save"), GTK_RESPONSE_ACCEPT);
   gtk_dialog_set_default_response (GTK_DIALOG (closure.chooser), GTK_RESPONSE_ACCEPT);
 
   gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (closure.chooser), TRUE);
@@ -2059,9 +2059,9 @@ test_action_widgets (void)
   dialog = gtk_file_chooser_dialog_new ("Test file chooser",
                                        NULL,
                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                       GTK_STOCK_CANCEL,
+                                       _("_Cancel"),
                                        GTK_RESPONSE_CANCEL,
-                                       GTK_STOCK_OK,
+                                       _("_OK"),
                                        GTK_RESPONSE_ACCEPT,
                                        NULL);
   gtk_widget_show_now (dialog);
@@ -2097,9 +2097,9 @@ test_reload_sequence (gboolean set_folder_before_map)
   dialog = gtk_file_chooser_dialog_new ("Test file chooser",
                                        NULL,
                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                       GTK_STOCK_CANCEL,
+                                       _("_Cancel"),
                                        GTK_RESPONSE_CANCEL,
-                                       GTK_STOCK_OK,
+                                       _("_OK"),
                                        GTK_RESPONSE_ACCEPT,
                                        NULL);
   impl = get_impl_from_dialog (dialog);
@@ -2258,8 +2258,8 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_
   if (use_dialog)
     {
       dialog = gtk_file_chooser_dialog_new ("Test", NULL, action,
-                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                           GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                           _("_OK"), GTK_RESPONSE_ACCEPT,
                                            NULL);
       button = gtk_file_chooser_button_new_with_dialog (dialog);
 
@@ -2398,8 +2398,8 @@ test_folder_switch_and_filters (void)
   base_dir = g_build_filename (cwd, "file-chooser-test-dir", NULL);
 
   dialog = gtk_file_chooser_dialog_new ("Test", NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
-                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                       GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                       _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                       _("_OK"), GTK_RESPONSE_ACCEPT,
                                        NULL);
   impl = get_impl_from_dialog (dialog);
 
diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c
index 32c1e680804a34627df98bc08b00a28a1a1383e0..66ccd1f0de614eaf88e726d781b20430cf7793d8 100644 (file)
--- a/testsuite/gtk/templates.c
+++ b/testsuite/gtk/templates.c
@@ -230,7 +230,7 @@ test_file_chooser_dialog_basic (void)
 
   widget = gtk_file_chooser_dialog_new ("The Dialog", NULL,
                                        GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-                                       GTK_STOCK_OK, GTK_RESPONSE_OK,
+                                       "_OK", GTK_RESPONSE_OK,
                                        NULL);
 
   g_assert (GTK_IS_FILE_CHOOSER_DIALOG (widget));
diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index 5d5d7c3c14cac9a9768b6f7187915c7df0ed13d0..95f0635af1d01bb8889072dec21cd5d614ca6bba 100644 (file)
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -80,47 +80,43 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem1">
-                        <property name="label">gtk-new</property>
+                      <object class="GtkMenuItem" id="imagemenuitem1">
+                        <property name="label" translatable="yes">_New</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem2">
-                        <property name="label">gtk-open</property>
+                      <object class="GtkMenuItem" id="imagemenuitem2">
+                        <property name="label" translatable="yes">_Open</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem3">
-                        <property name="label">gtk-save</property>
+                      <object class="GtkMenuItem" id="imagemenuitem3">
+                        <property name="label" translatable="yes">_Save</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem4">
-                        <property name="label">gtk-save-as</property>
+                      <object class="GtkMenuItem" id="imagemenuitem4">
+                        <property name="label" translatable="yes">Save _As</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
@@ -132,14 +128,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="label">gtk-quit</property>
+                      <object class="GtkMenuItem" id="imagemenuitem5">
+                        <property name="label" translatable="yes">_Quit</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                   </object>
@@ -160,62 +155,57 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem6">
-                        <property name="label">gtk-cut</property>
+                      <object class="GtkMenuItem" id="imagemenuitem6">
+                        <property name="label" translatable="yes">Cu_t</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem7">
-                        <property name="label">gtk-copy</property>
+                      <object class="GtkMenuItem" id="imagemenuitem7">
+                        <property name="label" translatable="yes">_Copy</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem8">
-                        <property name="label">gtk-paste</property>
+                      <object class="GtkMenuItem" id="imagemenuitem8">
+                        <property name="label" translatable="yes">_Paste</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem9">
-                        <property name="label">gtk-delete</property>
+                      <object class="GtkMenuItem" id="imagemenuitem9">
+                        <property name="label" translatable="yes">_Delete</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="togglesmenuitem">
+                      <object class="GtkMenuItem" id="togglesmenuitem">
                         <property name="label">Checks &amp; Radios</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="togglessubmenu">
                             <property name="name">inherit</property>
@@ -424,14 +414,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="label">gtk-about</property>
+                      <object class="GtkMenuItem" id="imagemenuitem10">
+                        <property name="label" translatable="yes">_About</property>
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                   </object>
@@ -461,7 +450,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-save</property>
+                <property name="icon_name">document-save</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -476,7 +465,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-open</property>
+                <property name="icon_name">document-open</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -503,7 +492,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Find</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-find</property>
+                <property name="icon_name">edit-find</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index c8a31e8faf2c8dc17393c9a8a6d6662f0341e0a8..a0f053bcb4ece114f6d7f2adb34ca5b094ec5da0 100644 (file)
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -76,43 +76,39 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem1">
-                        <property name="label">gtk-new</property>
+                      <object class="GtkMenuItem" id="imagemenuitem1">
+                        <property name="label" translatable="yes">_New</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem2">
-                        <property name="label">gtk-open</property>
+                      <object class="GtkMenuItem" id="imagemenuitem2">
+                        <property name="label" translatable="yes">_Open</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem3">
-                        <property name="label">gtk-save</property>
+                      <object class="GtkMenuItem" id="imagemenuitem3">
+                        <property name="label" translatable="yes">_Save</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem4">
-                        <property name="label">gtk-save-as</property>
+                      <object class="GtkMenuItem" id="imagemenuitem4">
+                        <property name="label" translatable="yes">Save _As</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
@@ -123,13 +119,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem5">
-                        <property name="label">gtk-quit</property>
+                      <object class="GtkMenuItem" id="imagemenuitem5">
+                        <property name="label" translatable="yes">_Quit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                   </object>
@@ -148,57 +143,52 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem6">
-                        <property name="label">gtk-cut</property>
+                      <object class="GtkMenuItem" id="imagemenuitem6">
+                        <property name="label" translatable="yes">Cu_t</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem7">
-                        <property name="label">gtk-copy</property>
+                      <object class="GtkMenuItem" id="imagemenuitem7">
+                        <property name="label" translatable="yes">_Copy</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem8">
-                        <property name="label">gtk-paste</property>
+                      <object class="GtkMenuItem" id="imagemenuitem8">
+                        <property name="label" translatable="yes">_Paste</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem9">
-                        <property name="label">gtk-delete</property>
+                      <object class="GtkMenuItem" id="imagemenuitem9">
+                        <property name="label" translatable="yes">_Delete</property>
                         <property name="accel_group">accelgroup1</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkImageMenuItem" id="togglesmenuitem">
+                      <object class="GtkMenuItem" id="togglesmenuitem">
                         <property name="label">Checks &amp; Radios</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="togglessubmenu">
                             <property name="visible">True</property>
@@ -388,13 +378,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="label">gtk-about</property>
+                      <object class="GtkMenuItem" id="imagemenuitem10">
+                        <property name="label" translatable="yes">_About</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
                       </object>
                     </child>
                   </object>
@@ -422,7 +411,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Save</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-save</property>
+                <property name="icon_name">document-save</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -436,7 +425,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Open</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-open</property>
+                <property name="icon_name">document-open</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -461,7 +450,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                 <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">Find</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-find</property>
+                <property name="icon_name">edit-find</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui
index 51cc9dbfe24bf2b46b9889fbbdd3b9e350c1c471..1e450d5798affa3f12bfe168aabe6bb97571982a 100644 (file)
--- a/testsuite/reftests/separator-size.ref.ui
+++ b/testsuite/reftests/separator-size.ref.ui
@@ -12,7 +12,7 @@
           <object class="GtkImage" id="image1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-about</property>
+            <property name="icon_name">help-about</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -25,7 +25,7 @@
           <object class="GtkImage" id="image2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-about</property>
+            <property name="icon_name">help-about</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
@@ -38,7 +38,7 @@
           <object class="GtkImage" id="image3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-about</property>
+            <property name="icon_name">help-about</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
@@ -51,7 +51,7 @@
           <object class="GtkImage" id="image4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-about</property>
+            <property name="icon_name">help-about</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui
index 2ac388a42d193b6be594b690305f0f45d77465b0..006c44ec15965afa8aeb82ea733b545186a356d7 100644 (file)
--- a/testsuite/reftests/separator-size.ui
+++ b/testsuite/reftests/separator-size.ui
@@ -19,7 +19,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="stock">gtk-about</property>
+                <property name="icon_name">help-about</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -56,7 +56,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="stock">gtk-about</property>
+                <property name="icon_name">help-about</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -106,7 +106,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="stock">gtk-about</property>
+                <property name="icon_name">help-about</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -164,7 +164,7 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="stock">gtk-about</property>
+                <property name="icon_name">help-about</property>
               </object>
               <packing>
                 <property name="expand">False</property>
Unnamed repository; edit this file 'description' to name the repository.